Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conversion of Zstd images to non-OCI formats #2151

Merged
merged 4 commits into from
Oct 21, 2023

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Oct 20, 2023

For any Zstd layer, do a MIME type update (presumably converting from Zstd to something else) before we do the
format conversion, so that the format conversion doesn't fail with an unsupported MIME type.

Fixes #1260 .

…ures

... and rename local variables within the function to be a bit more explicit.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
... to share the check that ensures the input hasn't been affected.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
For any Zstd layer, do a MIME type update (presumably
converting from Zstd to something else) before we do the
format conversion, so that the format conversion doesn't
fail with an unsupported MIME type.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
(didn't read all new test cases)

@rhatdan
Copy link
Member

rhatdan commented Oct 21, 2023

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OCI Zstd → schema2 uncompressed manifest conversion fails
3 participants